Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Fri, 27 Apr 2007 09:54:37 +0000 (10:54 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Fri, 27 Apr 2007 09:54:37 +0000 (10:54 +0100)

Trivial merge